From ffbb87b692200bdd8aa75ec8b11c3ce06f54031f Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 11 Apr 2008 09:06:11 +0100 Subject: [PATCH] x86: disable PIT irq after S3 resume Signed-off-by: Yu Ke --- xen/arch/x86/time.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index c9dbdd929c..ccefc50cf2 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -990,7 +990,7 @@ void __init early_time_init(void) setup_irq(0, &irq0); } -static int __init late_time_init(void) +static int __init disable_pit_irq(void) { if ( !using_pit && cpu_has_apic ) { @@ -1001,7 +1001,7 @@ static int __init late_time_init(void) } return 0; } -__initcall(late_time_init); +__initcall(disable_pit_irq); void send_timer_event(struct vcpu *v) { @@ -1036,6 +1036,8 @@ int time_resume(void) { u64 tmp = init_pit_and_calibrate_tsc(); + disable_pit_irq(); + set_time_scale(&this_cpu(cpu_time).tsc_scale, tmp); resume_platform_timer(); -- 2.30.2